|
|
11ea93f3e7
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev
|
2015-06-15 16:54:26 +03:00 |
|
|
|
cf5bb8e1ab
|
Merge pull request #28 from sagidayan/matanBranch
Matan branch
|
2015-06-15 16:54:24 +03:00 |
|
|
|
26c66842b4
|
added getCourseByCampusName function
|
2015-06-15 16:54:12 +03:00 |
|
|
|
5b0d67152f
|
removed function
|
2015-06-15 16:53:56 +03:00 |
|
|
|
1ec45d107c
|
API & AngularJS: Updating API Routes - API_Dev Merge
and Service Update
|
2015-06-15 16:51:13 +03:00 |
|
|
|
1c05b8aea1
|
Merge pull request #27 from sagidayan/API_Dev
Api dev
|
2015-06-15 16:47:32 +03:00 |
|
|
|
f7172ab983
|
added function and changed functions path
|
2015-06-15 16:32:59 +03:00 |
|
|
|
379ede2617
|
models - added master_id
|
2015-06-15 16:32:35 +03:00 |
|
|
|
2dc319af48
|
QA: Update UserAPI_Test.py to new API scheme
|
2015-06-15 16:28:54 +03:00 |
|
|
|
97af27500d
|
QA: Pormatting UserAPI_Test
|
2015-06-15 16:24:01 +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
|
9f7a21eca8
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into matanBranch
|
2015-06-15 10:05:06 +03:00 |
|
|
|
7bba774a3f
|
Merge pull request #26 from sagidayan/API_Dev
Api dev
|
2015-06-15 03:42:12 +03:00 |
|
|
|
644e362818
|
API - added userRoutes
documentation - added to each API class
|
2015-06-15 01:41:53 +03:00 |
|
|
|
177292d7c8
|
API - separated different features of API
|
2015-06-15 01:38:46 +03:00 |
|
|
|
d9382e8fbe
|
Course - changed date formatting to JSON and some properties
|
2015-06-15 01:37:07 +03:00 |
|
|
|
7239d27da2
|
Projects - added master_id and changed some properties
|
2015-06-15 01:35:18 +03:00 |
|
|
|
279d637b82
|
added responses
|
2015-06-15 01:34:04 +03:00 |
|
etyemyer
|
aaa5ba223a
|
UserApi_Test - test getuserbytoken with valid,invalid and empty string
CampusesApi_test - with valid,invalid string
|
2015-06-14 23:45:09 +03:00 |
|
|
|
e7825a1c58
|
Merge pull request #22 from sagidayan/QA
UserApi_Test - test getuserbytoken with valid,invalid and empty string
|
2015-06-14 23:02:31 +03:00 |
|
|
|
831617ac15
|
Made Email_Utils
|
2015-06-14 23:01:47 +03:00 |
|
etyemyer
|
9ea00145f9
|
UserApi_Test - test getuserbytoken with valid,invalid and empty string
CampusesApi_test - with valid,invalid string
|
2015-06-14 22:49:10 +03:00 |
|
Matan Bar Yosef
|
db63665214
|
Downgrade angular version:
1.4.0 -> 1.3.6
|
2015-06-14 22:13:25 +03:00 |
|
|
|
ef28a39720
|
Update AngularJS in App
|
2015-06-14 22:09:08 +03:00 |
|
|
|
c32e0ad971
|
Merge pull request #21 from sagidayan/matanBranch
Matan branch
|
2015-06-14 22:06:50 +03:00 |
|
Matan Bar Yosef
|
c3e39e895a
|
registration submit skeleton
|
2015-06-14 22:06:27 +03:00 |
|
|
|
0a2f209311
|
Update AngularJS
|
2015-06-14 22:05:16 +03:00 |
|
|
|
d5354b014e
|
Merge pull request #20 from sagidayan/API_Dev
removed some prints
|
2015-06-14 20:24:32 +03:00 |
|
Matan Bar Yosef
|
cadb95651e
|
Email verification added-
empty user name test added
|
2015-06-14 20:22:00 +03:00 |
|
|
|
9276e7fe02
|
removed some prints
|
2015-06-14 20:21:19 +03:00 |
|
Matan Bar Yosef
|
ce8efbcaa9
|
Email verification added-
empty user name test added
|
2015-06-14 20:06:00 +03:00 |
|
|
|
6d6f239b2b
|
Added QA API Path
|
2015-06-14 19:58:02 +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 |
|
|
|
eafb124760
|
Merge pull request #19 from sagidayan/matanBranch
Matan branch
|
2015-06-14 19:21:32 +03:00 |
|
Matan Bar Yosef
|
c4b077a32f
|
interface position fixed
|
2015-06-14 18:54:51 +03:00 |
|
|
|
bb8af8807c
|
API: Doc format
|
2015-06-14 18:51:48 +03:00 |
|
|
|
1305762548
|
Changed AutoDoc formatting
|
2015-06-14 16:49:19 +03:00 |
|
|
|
ae8dcadae7
|
Changed AutoDoc responsive
|
2015-06-14 16:43:46 +03:00 |
|
|
|
f8469f5301
|
Changed AutoDoc layout
|
2015-06-14 16:39:14 +03:00 |
|
Matan Bar Yosef
|
32f0ffa9a0
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into matanBranch
|
2015-06-13 09:22:11 +03:00 |
|
|
|
ba15613417
|
Angularjs: Added new Service
sendValidationMail Service
|
2015-06-11 23:36:26 +03:00 |
|
|
|
435bb5ef3d
|
API: Email Validation Works (Only Production!)
|
2015-06-11 22:46:18 +03:00 |
|
|
|
eace60fcac
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-06-11 22:11:18 +03:00 |
|
|
|
bb2b1e4e20
|
Merge pull request #16 from sagidayan/API_Dev
Api dev
|
2015-06-11 22:10:55 +03:00 |
|
|
|
f31053f632
|
API: Added A Skeleton Route For Email Validation
|
2015-06-11 21:32:46 +03:00 |
|
|
|
d015986dfc
|
added Campus create method
|
2015-06-11 21:03:00 +03:00 |
|
|
|
628aad5e03
|
added 2 methods (is_lecturer, get_user_by_token)
|
2015-06-11 21:01:58 +03:00 |
|
