696 Commits

Author SHA1 Message Date
AntonyAntonio
c7cdfd7318 Guillermo - add creatae log architecture [skip ci] 2016-12-29 02:04:35 -03:00
AntonyAntonio
b718598f32 Guillermo - add creatae log architecture [skip ci] 2016-12-28 21:55:00 -03:00
Ivan Diaz
5874cf279e Merged in fix-some-bugs (pull request #103)
Fix some bugs
2016-12-27 16:05:42 -03:00
AntonyAntonio
4e92a0d7a0 Merge branch 'master' into OS175-registration-with-verification-token
Conflicts:
	tests/system/edit-settings.rb
2016-12-26 00:27:50 -03:00
ivan
01748a2a25 Ivan - Update redbean version to support php7 [skip ci] 2016-12-24 16:53:33 -03:00
AntonyAntonio
e24f46c278 Guillermo - add path /user/verify [skip ci] 2016-12-23 01:56:01 -03:00
AntonyAntonio
be2e492aa4 Guillermo - add path /user/verify [skip ci] 2016-12-23 01:27:21 -03:00
AntonyAntonio
5c2f482c10 Guillermo - add path /user/verify [skip ci] 2016-12-22 03:07:06 -03:00
ivan
488633b0c2 Ivan - Avoid staff deleting himself and avoid level change to oneself [skip ci] 2016-12-21 17:54:02 -03:00
ivan
91f8394ef6 Ivan - Add 6000 as max characters for commit [skip ci] 2016-12-21 17:07:34 -03:00
AntonyAntonio
69c3410e03 Guillermo - add test supported languages [skip ci] 2016-12-21 01:09:35 -03:00
AntonyAntonio
7f9c12df36 Guillermo - add supported and allowed editable [skip ci] 2016-12-21 00:00:19 -03:00
AntonyAntonio
d30d14d58b Merge branch 'master' into OS-132-add-supported-lenguages 2016-12-20 23:29:55 -03:00
AntonyAntonio
b26db547dc Guillermo - add supported languages[skip ci] 2016-12-20 23:29:19 -03:00
AntonyAntonio
83edf85f3d Guillermo - path edit-settings tests[skip ci] 2016-12-19 23:17:35 -03:00
AntonyAntonio
8aaca982d6 Merge branch 'master' into OS131-Path-system-edit-settings 2016-12-18 23:43:41 -03:00
AntonyAntonio
da2373e013 Guillermo - path edit-settings[skip ci] 2016-12-14 22:27:31 -03:00
Ivan Diaz
abea0bbb97 Merged in OS128-add-additionals-settings (pull request #96)
Os128 add additionals settings
2016-12-13 23:25:07 -03:00
Ivan Diaz
839bc0bf9e Merged in OS-168-update-dates (pull request #97)
OS-168 update dates
2016-12-13 22:06:58 -03:00
ivan
8d2033ec31 Ivan - Updates needed for dev3 deploy [skip ci] 2016-12-13 21:10:49 -03:00
ivan
05380fdfda Ivan - Add transfer to department [skip ci] 2016-12-13 20:19:17 -03:00
AntonyAntonio
0000fe5159 Guillermo - path edit-settings[skip ci] 2016-12-13 02:03:35 -03:00
AntonyAntonio
2a1176516c Guillermo - additional settings[skip ci] 2016-12-13 00:21:06 -03:00
AntonyAntonio
d13ff18528 Guillermo - add new settings[skip ci] 2016-12-13 00:19:57 -03:00
Ivan Diaz
5fca935c8d Merged in 114-staff-member-view (pull request #92)
114 staff member view
2016-12-12 17:57:47 -03:00
Ivan Diaz
763e83331b Merged in OS-124-departments-paths (pull request #93)
Guillermo -   department parths/ department tests
2016-12-12 17:47:33 -03:00
Max Red
be3cdf25f9 Max - modifies backend date function [skip ci] 2016-12-12 15:56:25 -03:00
AntonyAntonio
496dc9d939 Guillermo - department parths/ department tests[skip ci] 2016-12-12 02:12:17 -03:00
Ivan Diaz
54151612f7 Ivan - Add my account and fix styling issues [skip ci] 2016-12-12 01:46:50 -03:00
AntonyAntonio
49a4620457 Guillermo - department add owners property[skip ci] 2016-12-10 18:55:12 -03:00
Ivan Diaz
97ef914d27 Guillermo - staff/add-last-login [skip ci] 2016-12-08 17:39:47 -03:00
Ivan Diaz
980904f86e Guillermo - staff/edit[skip ci] 2016-12-08 14:30:19 -03:00
ivan
895fbf011f GUILLERMO - all test staff [skip ci] 2016-12-08 03:21:37 -03:00
Ivan Diaz
829e6060f5 Guillermo - staff/edit[skip ci] 2016-12-07 23:43:32 -03:00
Ivan Diaz
6bad194903 Guillermo - staff/edit[skip ci] 2016-12-07 19:30:31 -03:00
Ivan Diaz
d57baa6cd8 Guillermo - staff/dellete[skip ci] 2016-12-07 17:24:42 -03:00
Ivan Diaz
630e121bfb Guillermo - staff/add [skip ci] 2016-12-07 16:59:42 -03:00
AntonyAntonio
60211c2b3c Guillermo - path / staff/delete[skip ci] 2016-12-07 02:06:50 -03:00
AntonyAntonio
1a3adfe418 Guillermo - path / staff/get-all[skip ci] 2016-12-07 01:37:18 -03:00
AntonyAntonio
b2547ce5f8 Guillermo - path / staff/add[skip ci] 2016-12-06 01:32:00 -03:00
AntonyAntonio
8dd11af96b Guillermo - path / staff/add[skip ci] 2016-12-05 23:17:18 -03:00
ivan
cbc4c15101 Ivan - Fix issues with release block 2 part 2 2016-12-04 23:51:45 -03:00
AntonyAntonio
d40327f0ce Guillermo - ban-on-signup[skip ci] 2016-12-04 04:08:42 -03:00
ivan
f6ae50ef87 guillermo- banning architecture [skip ci] 2016-11-30 19:16:18 -03:00
ivan
f3c1882a13 guillermo- delete-user [skip ci] 2016-11-30 17:30:00 -03:00
ivan
5907cbda00 guillermo- get-user [skip ci] 2016-11-30 14:13:57 -03:00
ivan
8ab6240385 guillermo- get-users [skip ci] 2016-11-30 03:33:46 -03:00
ivan
2703f82253 Ivan - Fix master issues. Improve error handling 2016-11-24 18:02:18 -03:00
ivan
94fd359098 Ivan - Add articles paths [skip ci] 2016-11-22 22:27:05 -03:00
ivan
d227b3f34d Ivan - Create article and topic datastore [skip ci] 2016-11-21 16:55:05 -03:00