|
|
f1561f025f
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-06-16 23:40:24 +03:00 |
|
|
|
f2fbd6617a
|
Merge branch 'API_Dev'
|
2015-06-16 23:40:00 +03:00 |
|
|
|
354d194f32
|
Merge branch 'master' into API_Dev
Conflict Fixed
|
2015-06-16 23:39:31 +03:00 |
|
|
|
492a3e9ce1
|
Merge pull request #44 from sagidayan/UI
- fixed mdDialog on email error
|
2015-06-16 23:36:39 +03:00 |
|
Matan Bar Yosef
|
434572fce7
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-06-16 23:32:31 +03:00 |
|
|
|
f5be224cb2
|
Menu is usable (issue #42) and starting settings
|
2015-06-16 23:32:10 +03:00 |
|
Matan Bar Yosef
|
37880d649a
|
- fixed mdDialog on email error
|
2015-06-16 23:29:34 +03:00 |
|
|
|
ea728b0cc7
|
documentation
|
2015-06-16 23:23:09 +03:00 |
|
|
|
6518fa3ff3
|
courseName is optional
|
2015-06-16 23:22:44 +03:00 |
|
|
|
24d8252d07
|
API: Hot-Fix for the GetUserByToken Method
|
2015-06-16 23:08:37 +03:00 |
|
|
|
cd6d428dd8
|
Merge pull request #41 from sagidayan/API_Dev
added option to change campus name
|
2015-06-16 22:49:05 +03:00 |
|
|
|
352a4c2a8d
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-06-16 22:47:58 +03:00 |
|
|
|
001d931b12
|
Merge branch 'se-hub-33'
|
2015-06-16 22:46:05 +03:00 |
|
|
|
06f9425928
|
issue #33 - Main Menu
Done
|
2015-06-16 22:45:06 +03:00 |
|
|
|
a29e9bce46
|
added option to change campus name
|
2015-06-16 22:42:15 +03:00 |
|
|
|
a77413742b
|
Merge pull request #40 from sagidayan/API_Dev
Api dev
|
2015-06-16 22:32:13 +03:00 |
|
|
|
4bb17157d0
|
fix updateUser - added save ro DB
fix parameter name
fix documentation
|
2015-06-16 22:28:05 +03:00 |
|
|
|
d428da5df0
|
added a missing parameter (master_id) that made function not usable
|
2015-06-16 22:16:11 +03:00 |
|
|
|
2ebd7392e4
|
fix bug #25
|
2015-06-16 22:11:33 +03:00 |
|
|
|
b3dc506d49
|
Merge UI - Conflict Fixed
|
2015-06-16 20:38:26 +03:00 |
|
|
|
45f59dcbcb
|
se-hub-33 #33 - Main Menu - More Skeleton
|
2015-06-16 20:34:37 +03:00 |
|
|
|
190d9510ba
|
se-hub-33 #33 - Main Menu - Skeleton
|
2015-06-16 20:34:17 +03:00 |
|
|
|
e7be15b692
|
Merge pull request #38 from sagidayan/UI
Ui
|
2015-06-16 20:33:51 +03:00 |
|
Matan Bar Yosef
|
51fa91d601
|
- email validation for lecturer in campus now working!
|
2015-06-16 20:24:09 +03:00 |
|
Matan Bar Yosef
|
0b4af040c7
|
-create campus Fixed
- email validation for lecturer in campus fixed!!
|
2015-06-16 19:19:17 +03:00 |
|
Matan Bar Yosef
|
191bbdc634
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-06-16 18:31:01 +03:00 |
|
Matan Bar Yosef
|
652906fee6
|
comment fixed in order to pull from master
|
2015-06-16 18:30:47 +03:00 |
|
|
|
d7f3d8d465
|
API: Fixing Update User Method GET->POST
|
2015-06-16 18:16:01 +03:00 |
|
|
|
ad528f910f
|
UI: Changed The Fonts (Now Using Alef) with fallback options
|
2015-06-16 14:32:57 +03:00 |
|
|
|
11b7aef006
|
AngularJS: Added Home Route + Home Controller + Home View
|
2015-06-16 14:15:59 +03:00 |
|
Matan Bar Yosef
|
10458ca034
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-06-16 13:31:24 +03:00 |
|
|
|
ab09d9851c
|
Merge pull request #34 from sagidayan/UI
-create campus as lecturer added
|
2015-06-16 12:20:23 +03:00 |
|
Matan Bar Yosef
|
79a69225a1
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI
|
2015-06-16 12:05:43 +03:00 |
|
Matan Bar Yosef
|
12552e9ca5
|
-create campus as lecturer added
|
2015-06-16 11:34:04 +03:00 |
|
|
|
9b62bec0b6
|
Merge pull request #32 from sagidayan/API_Dev
added updateUser function
|
2015-06-16 09:40:05 +03:00 |
|
|
|
bd541b59c4
|
QA: Fixed a small test in UserAPI
|
2015-06-16 09:37:25 +03:00 |
|
|
|
0a403286bf
|
API: Fixed Testing init route function
|
2015-06-16 09:35:41 +03:00 |
|
|
|
a4b8e96a14
|
Merge pull request #31 from sagidayan/QA
Qa
|
2015-06-16 09:33:26 +03:00 |
|
etyemyer
|
f25e508623
|
UserApi_Test - test getuserbytoken with valid,invalid and empty string
CampusesApi_test - with valid,invalid string
|
2015-06-15 22:11:46 +03:00 |
|
etyemyer
|
6c7cecb943
|
UserApi_Test
CampusesApi_test
|
2015-06-15 22:07:16 +03:00 |
|
etyemyer
|
315e07aad2
|
UserApi_Test - test getuserbytoken with valid,invalid and empty string
CampusesApi_test - with valid,invalid string
|
2015-06-15 20:49:57 +03:00 |
|
|
|
2671376db4
|
added updateUser function
|
2015-06-15 19:54:15 +03:00 |
|
|
|
daf39d81cd
|
Merge pull request #30 from sagidayan/UI
Ui
|
2015-06-15 19:13:46 +03:00 |
|
Matan Bar Yosef
|
06a883e103
|
documentation added
alpha test for userPrivilege
|
2015-06-15 19:12:54 +03:00 |
|
|
|
61bbc8d30e
|
Merge pull request #29 from sagidayan/API_Dev
Api dev
|
2015-06-15 19:11:34 +03:00 |
|
|
|
59663af67d
|
changed create campus dunc to send mails
|
2015-06-15 19:10:38 +03:00 |
|
|
|
5c2fd67e20
|
Cleaning
|
2015-06-15 19:10:26 +03:00 |
|
|
|
4d49e93d8c
|
added documentation
|
2015-06-15 19:06:45 +03:00 |
|
|
|
7f1b912b36
|
added documentation
|
2015-06-15 18:58:03 +03:00 |
|
|
|
d04cd2c7ce
|
API: Auto Doc Index
|
2015-06-15 18:57:01 +03:00 |
|
