Commit graph

413 commits

Author SHA1 Message Date
cfb2dbc4cd small syntax fix 2015-06-18 21:30:09 +03:00
Matan Bar Yosef
a2b763e00d - feed design Fixed 2015-06-18 21:13:31 +03:00
af608da379 Home Animation Only Once fix 2015-06-18 00:04:36 +03:00
83b252249d Home Animation 2015-06-17 23:58:59 +03:00
300c1074f8 Merge pull request #48 from sagidayan/UI
Home Page - feed pattern added
2015-06-17 23:19:09 +03:00
etyemyer
faad6dae00 Added Tests CoursesApi - course create
UserApi - Fixed tests
2015-06-17 23:18:13 +03:00
Matan Bar Yosef
ee7e023d56 - removed md-list "no style" and other styling
- feed pattern Added
2015-06-17 23:16:49 +03:00
42f8d27b94 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-17 22:46:32 +03:00
51d11cac93 More Setings UI Tweaks 2015-06-17 22:46:26 +03:00
3756d8b2a6 Merge pull request #47 from sagidayan/UI
Ui
2015-06-17 22:45:52 +03:00
Matan Bar Yosef
998bba0e29 - updateUser service and implement added 2015-06-17 22:38:07 +03:00
Matan Bar Yosef
69ad2028b8 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-06-17 22:13:40 +03:00
d736cb021a Merge branch 'se-hub-43' 2015-06-17 21:00:52 +03:00
46f374430d missing js File 2015-06-17 21:00:37 +03:00
c264d908fb Added New dataService - to sync mainController data with other scopes 2015-06-17 20:59:45 +03:00
3465ff3465 Added Logout Function 2015-06-17 20:14:53 +03:00
f87a14b2da Fix issue #24 2015-06-17 20:07:20 +03:00
Matan Bar Yosef
870dfd25a7 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-06-17 11:11:22 +03:00
980d81324c #43 - Settings Page: Profile Edit Mode 2015-06-17 00:16:26 +03:00
f258856102 #43 - Settings Page: Some More UI
Thinking About UI and Implementing it
2015-06-17 00:07:21 +03:00
etyemyer
02dc0c58ee Merge branch 'master' of https://github.com/sagidayan/SE-Hub into QA 2015-06-16 23:56:49 +03:00
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
etyemyer
1f01d2522d Merge branches 'QA' and 'master' of https://github.com/sagidayan/SE-Hub into QA 2015-06-16 23:15:38 +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
etyemyer
0818060378 UserApi_Test - test getuserbytoken with valid,invalid and empty string
CampusesApi_test -  with valid,invalid string
2015-06-16 19:17:49 +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