sagi/se-hub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
569 commits 4 branches 0 tags 3.4 MiB
Commit graph

569 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sagi Dayan 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
etyemyer d15adbd1a8 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into QA 2015-06-16 18:17:37 +03:00
Sagi Dayan d7f3d8d465 API: Fixing Update User Method GET->POST 2015-06-16 18:16:01 +03:00
etyemyer 1df1239f18 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into QA 2015-06-16 17:46:42 +03:00
Sagi Dayan ad528f910f UI: Changed The Fonts (Now Using Alef) with fallback options 2015-06-16 14:32:57 +03:00
Sagi Dayan 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
Sagi Dayan 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
Sagi Dayan 9b62bec0b6 Merge pull request #32 from sagidayan/API_Dev 
added updateUser function
 2015-06-16 09:40:05 +03:00
Sagi Dayan bd541b59c4 QA: Fixed a small test in UserAPI 2015-06-16 09:37:25 +03:00
Sagi Dayan 0a403286bf API: Fixed Testing init route function 2015-06-16 09:35:41 +03:00
Sagi Dayan a4b8e96a14 Merge pull request #31 from sagidayan/QA 
Qa
 2015-06-16 09:33:26 +03:00
etyemyer a943d370d1 UserApi_Test - test getuserbytoken with valid,invalid and empty string 
CampusesApi_test -  with valid,invalid string
 2015-06-15 22:21:07 +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
Aran Zaiger 2671376db4 added updateUser function 2015-06-15 19:54:15 +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 61bbc8d30e Merge pull request #29 from sagidayan/API_Dev 
Api dev
 2015-06-15 19:11:34 +03:00
Aran Zaiger 59663af67d changed create campus dunc to send mails 2015-06-15 19:10:38 +03:00
Sagi Dayan 5c2fd67e20 Cleaning 2015-06-15 19:10:26 +03:00
Aran Zaiger 4d49e93d8c added documentation 2015-06-15 19:06:45 +03:00
Aran Zaiger 7f1b912b36 added documentation 2015-06-15 18:58:03 +03:00
Sagi Dayan d04cd2c7ce API: Auto Doc Index 2015-06-15 18:57:01 +03:00
Sagi Dayan b5a63e64e0 API: Auto Doc Index 2015-06-15 18:56:33 +03:00
Sagi Dayan 73d9a65dab AngularJS: Fixed Scope Issue & more 
Starting to work on the mailController
 2015-06-15 18:41:44 +03:00
Aran Zaiger 1d9cbbfa6b getProjectsByCourseName function fix 2015-06-15 18:37:08 +03:00
Aran Zaiger 991d6a73bc added some data verifiaction 2015-06-15 18:35:47 +03:00
Aran Zaiger ab4cdab12d removed project list from course and added course to project 2015-06-15 18:34:02 +03:00
Sagi Dayan 39a5697fd0 Added small Shadow to avatars - looks better 2015-06-15 18:15:36 +03:00
Sagi Dayan ed7519305b AngularJS: Finally fixed the logo in welcome screen! 2015-06-15 18:07:15 +03:00
Matan Bar Yosef fd11a512bd changing branch name to UI 2015-06-15 17:46:02 +03:00
Aran Zaiger f5cac61856 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev 2015-06-15 16:56:12 +03:00
Aran Zaiger 11ea93f3e7 Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev 2015-06-15 16:54:26 +03:00
Sagi Dayan cf5bb8e1ab Merge pull request #28 from sagidayan/matanBranch 
Matan branch
 2015-06-15 16:54:24 +03:00
Aran Zaiger 26c66842b4 added getCourseByCampusName function 2015-06-15 16:54:12 +03:00
Aran Zaiger 5b0d67152f removed function 2015-06-15 16:53:56 +03:00
Sagi Dayan 1ec45d107c API & AngularJS: Updating API Routes - API_Dev Merge 
and Service Update
 2015-06-15 16:51:13 +03:00
Sagi Dayan 1c05b8aea1 Merge pull request #27 from sagidayan/API_Dev 
Api dev
 2015-06-15 16:47:32 +03:00
Aran Zaiger f7172ab983 added function and changed functions path 2015-06-15 16:32:59 +03:00
Aran Zaiger 379ede2617 models - added master_id 2015-06-15 16:32:35 +03:00
Sagi Dayan 2dc319af48 QA: Update UserAPI_Test.py to new API scheme 2015-06-15 16:28:54 +03:00