Commit Graph

8667 Commits

Author SHA1 Message Date
psychobunny
91c02d4e29 ditching rewardID in favour of verbose id's 2015-02-19 22:19:04 -05:00
psychobunny
46e0fad2d8 rewards: code organization, getting ready to code saving/loading of active rewards 2015-02-19 22:06:52 -05:00
psychobunny
2cc6f0c507 fixed disable logic 2015-02-19 21:56:50 -05:00
psychobunny
4acf8cafee rewards: adding new rows 2015-02-19 21:51:32 -05:00
psychobunny
029ae11ed5 rewards - cleanup 2015-02-19 19:10:01 -05:00
psychobunny
3ca11c1947 rewards: disable / delete 2015-02-19 18:51:42 -05:00
psychobunny
4145046e02 rewards: got everything loading 2015-02-19 18:46:36 -05:00
psychobunny
b1c37775c5 more styling 2015-02-19 18:22:21 -05:00
psychobunny
7457b22427 added more api fields to rewards 2015-02-19 17:48:01 -05:00
psychobunny
9291ec64f9 styling 2015-02-19 17:47:47 -05:00
psychobunny
d9bd7a400d minor styling 2015-02-19 17:29:44 -05:00
psychobunny
4f53bd59be rewards - got custom inputs loading 2015-02-19 17:24:58 -05:00
psychobunny
94c1c2d547 fixed loading mock data 2015-02-19 16:57:32 -05:00
psychobunny
2bebac964e loading mock data 2015-02-19 16:09:58 -05:00
psychobunny
0e7c3be9d3 made some progress with mock api + acp 2015-02-19 15:04:13 -05:00
psychobunny
bdcf090aaa init rewards system 2015-02-19 14:20:13 -05:00
Barış Soner Uşaklı
da305210e2 closes #2618 2015-02-19 13:24:06 -05:00
Barış Soner Uşaklı
97c0b130ca closes #2691 2015-02-19 12:23:44 -05:00
Julian Lam
350acde379 ability to mark a notification read/unread from dropdown list, made styling less bootstrap-locked, using FA icon in theme instead of hardcoded in template 2015-02-19 12:06:15 -05:00
Barış Soner Uşaklı
8eb45fc80a dont remove self from browsing 2015-02-19 12:04:53 -05:00
Barış Soner Uşaklı
d09fcbaef0 closes #2741 2015-02-19 11:17:29 -05:00
Julian Lam
268981f6db latest translations 2015-02-18 23:00:44 -05:00
Barış Soner Uşaklı
957a0840b1 Merge pull request #2736 from pitaj/master
Fix ACP sidebar affix issue
2015-02-18 21:55:51 -05:00
barisusakli
364ed641dd truncateUserList on search 2015-02-18 21:27:09 -05:00
barisusakli
aa94dafac1 closes #725 2015-02-18 21:09:33 -05:00
psychobunny
eb88d2fbd8 testing docgen again 2015-02-18 16:19:23 -05:00
psychobunny
1337924afb test commit - testing docgen 2015-02-18 16:04:46 -05:00
Julian Lam
6a69fcd4cd fixes #2665 2015-02-18 15:41:44 -05:00
Julian Lam
502e806f88 fixed #2732 -- group creation now using language keys, and no longer succeeds if a group by the name of 'guest' is created. 2015-02-18 15:34:01 -05:00
Peter Jaszkowiak
1ce0073cb6 Fixed events sidebar positioning 2015-02-18 13:30:06 -07:00
Peter Jaszkowiak
a2f4cda715 Fixed sidebar positioning 2015-02-18 13:26:13 -07:00
Barış Soner Uşaklı
dca143fd87 Merge pull request #2706 from acardinale/master
Add hooks "filter:topic.build" and "filter:category.build"
2015-02-18 10:48:05 -05:00
acardinale
6607dfc4c9 Update categories.js 2015-02-18 15:27:14 +01:00
acardinale
8975a0962e Update topics.js 2015-02-18 15:26:05 +01:00
barisusakli
d577371a51 fix test 2015-02-18 07:41:35 -05:00
barisusakli
0dca86f255 fix tests 2015-02-18 07:36:49 -05:00
barisusakli
60efeb8561 fix nid 2015-02-18 07:28:53 -05:00
barisusakli
31a44a9982 dont use fa icon 2015-02-18 00:04:55 -05:00
Barış Soner Uşaklı
25b25319f1 Merge pull request #2727 from yariplus/fixselects
Fix select and select multiple loading/saving on widget ACP.
2015-02-17 23:09:51 -05:00
barisusakli
3bcd8aefb0 deleteObjectFields method
cleaned up user reset
2015-02-17 22:22:06 -05:00
barisusakli
75657605ad fix typo in search 2015-02-17 18:57:24 -05:00
barisusakli
fbcc7c4bc3 closes #2634 2015-02-17 18:52:54 -05:00
barisusakli
c305cd8220 removed commented out code 2015-02-17 18:14:29 -05:00
barisusakli
0096d74cfa user password reset test 2015-02-17 18:11:30 -05:00
barisusakli
150d33eb92 upgrade script to rename widgets:home.tpl to widgets:categories.tpl 2015-02-17 17:55:20 -05:00
Julian Lam
df7c48c474 restoring latest plugin version in plugins ACP 2015-02-17 16:09:25 -05:00
Julian Lam
7bb9ea4b33 querying via qs now 2015-02-17 16:01:57 -05:00
Barış Soner Uşaklı
276cd51836 closes #2467 2015-02-17 15:14:06 -05:00
psychobunny
0611b7e1ea closes #2733 2015-02-17 15:12:43 -05:00
Barış Soner Uşaklı
8f6b577bad Update package.json 2015-02-17 14:50:08 -05:00