Commit graph

164 commits

Author SHA1 Message Date
Matan Bar Yosef 1b3aaea1ff Merge branch 'master' of https://github.com/sagidayan/SE-Hub into UI 2015-06-24 14:26:13 +03:00
Matan Bar Yosef ba5939c437 - Create course api -fixed 2015-06-24 14:01:08 +03:00
Sagi Dayan 049c36c916 Fixed HRef 2015-06-24 13:42:32 +03:00
Sagi Dayan 5f53e3ff85 Fixing Register POPUP 2015-06-24 13:28:27 +03:00
Sagi Dayan ad45ee787d Merge pull request #66 from sagidayan/UI
- add choose project from dashboard
2015-06-24 13:17:58 +03:00
Matan Bar Yosef 38ae45aa95 - add choose project from dashboard 2015-06-24 13:13:58 +03:00
Sagi Dayan d32b09b712 Fixed Token Issue in Register Controller 2015-06-24 13:07:17 +03:00
Sagi Dayan 3c8c262fe6 Merge pull request #60 from sagidayan/UI
- my classes fixed buttons
2015-06-23 20:36:37 +03:00
Matan Bar Yosef 88906c30a8 - my classes fixed buttons 2015-06-23 20:34:26 +03:00
Sagi Dayan 7a4f669f90 Typo in projectsController 2015-06-23 20:32:29 +03:00
Matan Bar Yosef ff9ea86131 - Files Added: myClasses, newcourse, projects, tasks 2015-06-23 19:40:30 +03:00
Matan Bar Yosef 1d5655b056 - create course - added
- show my classes - added
2015-06-23 19:04:41 +03:00
Sagi Dayan 454c81d16b Create New Task Page - Fully functional. need submit button 2015-06-22 22:37:47 +03:00
Matan Bar Yosef eb5391cb82 - Projects controller and page - added
- project zoom and open in another page - added
2015-06-22 14:45:50 +03:00
Sagi Dayan 4deeb3084f Merge branch 'master' into UI 2015-06-22 13:16:38 +03:00
Matan Bar Yosef 1e6e3f24f2 -DashBoard pattern and messages - fixed
-Project evaluation pattern - added
2015-06-22 13:06:56 +03:00
Sagi Dayan 44aaa5c08f Fixing A BAAAD Commit 2015-06-22 13:04:21 +03:00
Sagi Dayan 0be52f2b0a Merged Conflict FIX API_Dev -> MASTER 2015-06-21 22:29:47 +03:00
Sagi Dayan 94a9c3dbb0 Begining of add new tesk 2015-06-21 22:27:48 +03:00
Aran Zaiger 3f272dc304 garbage commit 2015-06-21 22:22:13 +03:00
Matan Bar Yosef badcf43151 - Lecturer / Student Mode added
- TODO fix previous text input from (add message by lecturer)
2015-06-20 14:58:30 +03:00
Matan Bar Yosef 3c48e3fbe9 - Add message for lecturer - ADDED
- Clear all messages for lecturer - ADDED

- Overflow - FIXED
2015-06-20 14:21:32 +03:00
Sagi Dayan 4221439085 Added a js chart lib + example in settings 2015-06-19 00:02:06 +03:00
Sagi Dayan 5b6e6e9298 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-18 23:26:58 +03:00
Sagi Dayan da224b25d8 Settings: Now Updating the user via API call 2015-06-18 23:26:51 +03:00
Matan Bar Yosef 94cf0447e4 - tasks.html added
- tasksController added

- app.js updated when '/tasks'

- mainController updated '/tasks'
2015-06-18 23:21:09 +03:00
Matan Bar Yosef a2b763e00d - feed design Fixed 2015-06-18 21:13:31 +03:00
Sagi Dayan af608da379 Home Animation Only Once fix 2015-06-18 00:04:36 +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
Sagi Dayan 42f8d27b94 Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-17 22:46:32 +03:00
Sagi Dayan 51d11cac93 More Setings UI Tweaks 2015-06-17 22:46:26 +03:00
Matan Bar Yosef 998bba0e29 - updateUser service and implement added 2015-06-17 22:38:07 +03:00
Sagi Dayan d736cb021a Merge branch 'se-hub-43' 2015-06-17 21:00:52 +03:00
Sagi Dayan c264d908fb Added New dataService - to sync mainController data with other scopes 2015-06-17 20:59:45 +03:00
Sagi Dayan 3465ff3465 Added Logout Function 2015-06-17 20:14:53 +03:00
Sagi Dayan f258856102 #43 - Settings Page: Some More UI
Thinking About UI and Implementing it
2015-06-17 00:07:21 +03:00
Sagi Dayan f1561f025f Merge branch 'master' of github.com:sagidayan/SE-Hub 2015-06-16 23:40:24 +03:00
Sagi Dayan 492a3e9ce1 Merge pull request #44 from sagidayan/UI
- fixed mdDialog on email error
2015-06-16 23:36:39 +03:00
Sagi Dayan 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
Sagi Dayan 001d931b12 Merge branch 'se-hub-33' 2015-06-16 22:46:05 +03:00
Sagi Dayan 06f9425928 issue #33 - Main Menu
Done
2015-06-16 22:45:06 +03:00
Sagi Dayan b3dc506d49 Merge UI - Conflict Fixed 2015-06-16 20:38:26 +03:00
Sagi Dayan 45f59dcbcb se-hub-33 #33 - Main Menu - More Skeleton 2015-06-16 20:34:37 +03:00
Matan Bar Yosef 51fa91d601 - email validation for lecturer in campus now working! 2015-06-16 20:24:09 +03:00
Sagi Dayan 11b7aef006 AngularJS: Added Home Route + Home Controller + Home View 2015-06-16 14:15:59 +03:00
Matan Bar Yosef 12552e9ca5 -create campus as lecturer added 2015-06-16 11:34:04 +03:00
Sagi Dayan 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
Sagi Dayan 5c2fd67e20 Cleaning 2015-06-15 19:10:26 +03:00
Sagi Dayan 73d9a65dab AngularJS: Fixed Scope Issue & more
Starting to work on the mailController
2015-06-15 18:41:44 +03:00
Matan Bar Yosef fd11a512bd changing branch name to UI 2015-06-15 17:46:02 +03:00
Matan Bar Yosef 99c2128fa9 -Card Layout padding fixed
-cookies removal after login fixed
-redirect to welcome page added
2015-06-15 11:37:21 +03:00
Matan Bar Yosef db63665214 Downgrade angular version:
1.4.0 -> 1.3.6
2015-06-14 22:13:25 +03:00
Matan Bar Yosef c3e39e895a registration submit skeleton 2015-06-14 22:06:27 +03:00
Matan Bar Yosef cadb95651e Email verification added-
empty user name test added
2015-06-14 20:22:00 +03:00
Matan Bar Yosef ce8efbcaa9 Email verification added-
empty user name test added
2015-06-14 20:06:00 +03:00
Sagi Dayan 9ab8628f90 Merge remote-tracking branch 'origin/matanBranch'
# Conflicts:
#	templates/js/controllers/registerController.js
#	templates/views/register.html
2015-06-14 19:39:30 +03:00
Matan Bar Yosef c01372eb58 log in to homepage - fixed 2015-06-14 19:35:50 +03:00
Sagi Dayan 1fbf7a5af3 Fixed the ng-model 2015-06-14 19:31:16 +03:00
Matan Bar Yosef c4b077a32f interface position fixed 2015-06-14 18:54:51 +03:00
Sagi Dayan 8149e4c61f Register Campus picker 2015-06-09 20:53:57 +03:00
Sagi Dayan 5c5d91ca79 Fix To JS Error 2015-06-09 20:16:29 +03:00
Sagi Dayan 25ba685516 First Commit 2015-05-09 22:00:14 +03:00