|
|
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 |
|
|
|
dcb83987f8
|
-var name change in campus
-default value for Campus properties
|
2015-06-11 21:01:05 +03:00 |
|
|
|
e1b6f49686
|
added response utils
|
2015-06-11 20:59:40 +03:00 |
|
|
|
7edd66ff70
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into API_Dev
Conflicts:
SE_API/API.py
|
2015-06-10 21:44:12 +03:00 |
|
|
|
827cb0c17f
|
Added models: Project, Course, Task.
also added imports to api.py
|
2015-06-10 21:39:42 +03:00 |
|
|
|
3c5eba4fea
|
API: Added A Route To Send Validation Emails.
See /api/help
|
2015-06-10 18:47:53 +03:00 |
|
|
|
7830feb887
|
Merge branch 'master' of github.com:sagidayan/SE-Hub
|
2015-06-10 17:42:00 +03:00 |
|
|
|
5f4fbfcf61
|
Use Model Changes added camuses_id_list & classes_id_lists
|
2015-06-10 17:41:49 +03:00 |
|
|
|
3f736cb2ff
|
Merge pull request #15 from sagidayan/matanBranch
dropdown added
|
2015-06-10 17:40:52 +03:00 |
|
Matan Bar Yosef
|
031bcf6f10
|
Merge branch 'master' of https://github.com/sagidayan/SE-Hub into matanBranch
|
2015-06-10 16:06:07 +03:00 |
|
Matan Bar Yosef
|
942764af6a
|
dropdown added
fixed submit button
|
2015-06-10 16:04:24 +03:00 |
|
|
|
9698a5b4e2
|
API: Campus Hot Fix
|
2015-06-10 13:55:55 +03:00 |
|
|
|
5bdcff7f51
|
Angularjs: New api service method getAllCampuses
|
2015-06-10 13:36:31 +03:00 |
|
|
|
085047c2bf
|
API: Help page in /api/help
|
2015-06-10 13:15:41 +03:00 |
|
|
|
a37ef482ca
|
API: Added Campus Model - And A new API Call
|
2015-06-10 13:12:59 +03:00 |
|
|
|
9b887c0599
|
DD and z-index
|
2015-06-10 12:44:09 +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 |
|
|
|
336390d094
|
API: change ststus code on unfound user
|
2015-05-12 17:18:26 +03:00 |
|
|
|
114bbdfe8b
|
API: Fixed response in getUserByToken. returning JSON and not a string
|
2015-05-12 17:13:38 +03:00 |
|
|
|
7e2d8914a7
|
Merge to Master from API_Dev
|
2015-05-12 11:38:29 +03:00 |
|
