Chaoyi Zha
73365d2cdc
Merge branch 'master' of github.com:cydrobolt/polr
2016-12-02 20:28:56 -05:00
Chaoyi Zha
1f4b96758b
Merge branch 'ashazar-master'
2016-12-02 20:28:45 -05:00
Chaoyi Zha
ea3ca0e3a4
Disable search and ordering for action columns
2016-12-02 20:27:46 -05:00
Chaoyi Zha
8f197c97ed
Merge master into ashazar-master
2016-12-02 20:22:38 -05:00
Chaoyi Zha
3874ef0f59
composer is now required for installation
2016-12-02 20:19:45 -05:00
Chaoyi Zha
0f0c0328ce
Remove unnecessary roles parameter and add comment re: Angular for user creation
2016-12-02 20:16:07 -05:00
Chaoyi Zha
7a381632d0
Fix incorrect route names for user creation routes
2016-12-02 20:09:09 -05:00
Chaoyi Zha
c8e8500747
Fix typo in setup canonical group names
2016-12-02 20:03:40 -05:00
Chaoyi Zha
ba4865a00f
Refactor, fix setup variable access
2016-12-02 20:00:20 -05:00
Chaoyi Zha
e2314dd8ff
Remove hacky fixes for API data and DRY
2016-12-02 19:29:25 -05:00
Chaoyi Zha
5e21f2efc0
Automatically refresh data, refactor hideForm
2016-12-02 19:06:40 -05:00
Chaoyi Zha
559de49132
Remove element reference for role selection, use user->id to avoid ng-model collisions
2016-12-02 18:38:28 -05:00
Chaoyi Zha
e7b0b676e1
Refactor into Angular functions and resolve DRY
2016-12-02 17:07:59 -05:00
Chaoyi Zha
7982e0464b
Merge pull request #253 from jcalonso/cleanup/remove-vendor-dir
...
Remove vendor directory
2016-10-30 19:48:34 -04:00
Juan Carlos Alonso
854fa5b65f
Do not track vendor dir
2016-10-30 16:55:32 +00:00
Juan Carlos Alonso
2878e8ee6b
Removed vendor dir from repo
2016-10-30 16:54:54 +00:00
Chaoyi Zha
a5f1fda788
Merge branch 'force73-patch-2'
2016-10-13 15:33:09 -04:00
Chaoyi Zha
6659dbf5af
Fix indentation, remove unneeded tabindex
2016-10-13 15:32:50 -04:00
Chaoyi Zha
a025848eb7
Clean up code & remove inline styles
2016-10-13 15:19:01 -04:00
Christian Dinse
4c1c408f31
Update navbar.blade.php
...
moved the "About" link before all others to place it right.
2016-10-13 09:05:07 +02:00
Christian Dinse
b4a1428ccd
Update navbar.blade.php
...
Modified the file to hide "Dashboard", "Settings" and "Logout" links in navbar in desktop view. These links only needed in the users personal dropdown in desktop mode, so only show them there.
2016-10-12 17:55:23 +02:00
Chaoyi Zha
d52e78f475
Merge branch 'master' of https://github.com/ashazar/polr into ashazar-master
2016-10-11 22:48:09 -04:00
Chaoyi Zha
2926409f13
Output a helpful message in the JS console
2016-10-11 22:47:43 -04:00
Serdar Hazar
40fcef7b0d
Merge remote-tracking branch 'upstream/master'
2016-10-04 00:55:13 +03:00
Serdar Hazar
a7da1b25dd
Issue #200 , Realtime data change
2016-10-04 00:48:51 +03:00
Chaoyi Zha
6bc3fc6729
Fix user table search errors; disable search&ordering for action btns
2016-10-03 17:38:05 -04:00
Chaoyi Zha
36e94aba88
Wrap text in email & username fields
2016-10-03 17:30:17 -04:00
Serdar Hazar
6cdbff8e11
Merge remote-tracking branch 'upstream/master'
2016-10-04 00:13:14 +03:00
Chaoyi Zha
cfe4facc1b
Merge branch 'oittaa-patch-1'
2016-10-02 22:20:44 -04:00
Chaoyi Zha
30886414a1
Explicitly require ^1.0.6 random_compat
2016-10-02 22:20:26 -04:00
oittaa
bc2454aa79
[CryptoHelper.php] use random_bytes() function
2016-10-03 00:44:30 +03:00
Chaoyi Zha
d60aecf872
Merge pull request #237 from cydrobolt/feature/datatables
...
Add Datatables integration
2016-10-01 21:01:52 -04:00
Chaoyi Zha
b6547d2417
Remove old table data
2016-10-01 20:51:39 -04:00
Chaoyi Zha
f25b418aae
Create AdminPaginationController for Datatables pagination
2016-10-01 20:38:35 -04:00
Chaoyi Zha
8ba2826a7e
Add user link Datatable
2016-10-01 20:30:06 -04:00
Serdar Hazar
bd976a813f
Update API Active status, after changed; closed API info modal, and re-opened it
2016-10-02 03:18:55 +03:00
Serdar Hazar
54fcfbb3f3
change 'admin' to admin_role
2016-10-02 03:15:18 +03:00
Serdar Hazar
bc4c126383
Replaced tabs w/spaces. Delete unnecessary user->save
2016-10-02 01:00:02 +03:00
Serdar Hazar
65ed0734cc
Ability to Add New User in Admin panel
2016-10-02 00:54:22 +03:00
Serdar Hazar
14bdc5f43f
Defined User roles in UserHelper, and added ability to change roles
2016-10-01 21:52:24 +03:00
Chaoyi Zha
74acbecbd1
Use Datatables for admin tables WIPg
2016-09-30 22:10:58 -04:00
Chaoyi Zha
b7083233d6
Add Datatables Laravel dependencies
2016-09-30 21:45:04 -04:00
Serdar Hazar
f55a47f89a
Toggle User 'Active' status in Admin panel
2016-09-30 23:51:43 +03:00
Serdar Hazar
51a9413b92
Added alert box before deleting a user in Admin panel
2016-09-29 23:57:51 +03:00
Serdar Hazar
d1587f950d
Return 404, if POLR_ALLOW_ACCT_CREATION in environment set False
2016-09-29 22:22:02 +03:00
Chaoyi Zha
3c5cc1669d
Merge branch 'overint-addshortlinks'
2016-09-17 21:27:24 -04:00
Chaoyi Zha
c604ab52f3
Merge branch 'addshortlinks' of https://github.com/overint/polr into overint-addshortlinks
2016-09-17 21:22:43 -04:00
Chaoyi Zha
a164c48708
Merge branch 'overint-allowCORS'
2016-09-17 21:20:59 -04:00
overint
bad80591be
Allow CORS on API enpoints
2016-09-17 13:39:57 +10:00
overint
1063c9b244
Linkify short URLs on dashboard to allow copy/paste
2016-09-17 13:12:54 +10:00