Commit graph

28 commits

Author SHA1 Message Date
3f272dc304 garbage commit 2015-06-21 22:22:13 +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
Matan Bar Yosef
51fa91d601 - email validation for lecturer in campus now working! 2015-06-16 20:24:09 +03:00
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
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
5c2fd67e20 Cleaning 2015-06-15 19:10:26 +03:00
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
cf5bb8e1ab Merge pull request #28 from sagidayan/matanBranch
Matan branch
2015-06-15 16:54:24 +03:00
1ec45d107c API & AngularJS: Updating API Routes - API_Dev Merge
and Service Update
2015-06-15 16:51:13 +03:00
d0c91b0c70 AngularJS: Updating Services to the new API scheme 2015-06-15 16:23:42 +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
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
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
ba15613417 Angularjs: Added new Service
sendValidationMail Service
2015-06-11 23:36:26 +03:00
5bdcff7f51 Angularjs: New api service method getAllCampuses 2015-06-10 13:36:31 +03:00
8149e4c61f Register Campus picker 2015-06-09 20:53:57 +03:00
5c5d91ca79 Fix To JS Error 2015-06-09 20:16:29 +03:00
25ba685516 First Commit 2015-05-09 22:00:14 +03:00