summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Let's switch to OCP\JSONLukas Reschke2014-06-021-3/+3
* Use OCP\JSON instead of OC_JSONLukas Reschke2014-06-021-3/+3
* Remove legacy "Check for user comment"Lukas Reschke2014-06-021-3/+1
* Adds admin check on groupname changes.raghunayyar2014-06-021-0/+2
* Fixes Markup in templates.raghunayyar2014-06-021-29/+26
* resolving conflict when picking 8b81a0braghunayyar2014-06-027-247/+254
* do not show 0 when administered group has no usersArthur Schiwon2014-06-021-1/+1
* sort groups by user countArthur Schiwon2014-06-021-2/+20
* do not show 0 when group has no usersArthur Schiwon2014-06-021-1/+1
* load groups when clicking on themArthur Schiwon2014-06-023-7/+49
* Initial Commit: Takes Quota Settings inside Navigation, Changes Create -> Add...raghunayyar2014-06-022-31/+44
* Splits Code for Users and Groups.raghunayyar2014-06-023-136/+144
* reduce template function callsArthur Schiwon2014-06-021-1/+1
* add Last Login columnArthur Schiwon2014-06-027-5/+53
* Initial Commit : Changes Storage to Quota, Implements GroupName editing.raghunayyar2014-06-025-2/+68
* add Storage Location colArthur Schiwon2014-06-025-14/+28
* Adds Admin to Grouplist Everywhereraghunayyar2014-06-021-1/+7
* Removes Delete Icon from Admin Group.raghunayyar2014-06-022-6/+25
* Adds class button to fix font sizes.raghunayyar2014-06-021-2/+2
* Fixes User Search by username.raghunayyar2014-06-022-7/+6
* Initial Commit : User Search, Fixes Typosraghunayyar2014-06-024-3/+20
* Fixes delete icon only on hover.raghunayyar2014-06-021-1/+2
* Reverts Bogus Changes.raghunayyar2014-06-021-2/+2
* Deletes Group Clientside Effectively.raghunayyar2014-06-023-2/+59
* Implements Group Creation from Sidebarraghunayyar2014-06-023-5/+49
* Reverts last commit, implements user in group count.raghunayyar2014-06-025-81/+23
* Add GroupList Ajax to Users.raghunayyar2014-06-023-1/+78
* Splits Controls overlap in files and users.raghunayyar2014-06-023-2/+12
* resolve conflicts while picking c0fb623raghunayyar2014-06-023-30/+48
* Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579Arthur Schiwon2014-06-022-13/+31
* Merge pull request #8718 from owncloud/share_icons_for_shared_byVincent Petry2014-06-021-13/+31
|\
| * add share icons for folders shared by the current userBjoern Schiessle2014-05-301-13/+31
* | Merge pull request #8443 from owncloud/csrf-on-login-and-logoutVincent Petry2014-06-023-1/+14
|\ \
| * \ Merge branch 'master' into csrf-on-login-and-logoutThomas Müller2014-05-191565-36600/+68630
| |\ \
| * | | Redirect to index if the logout link is accessed without valid sessionLukas Reschke2014-05-111-0/+8
| * | | Add CSRF check on login and logoutLukas Reschke2014-05-043-1/+6
* | | | Merge pull request #8807 from owncloud/add_filecache_indexVincent Petry2014-06-021-0/+15
|\ \ \ \
| * | | | add another index to the filecache to reduce the number of queries without a ...Frank Karlitschek2014-05-311-0/+15
* | | | | Merge pull request #8187 from owncloud/escape-more-characterMorris Jobke2014-06-022-1/+12
|\ \ \ \ \
| * | | | | Fix typoLukas Reschke2014-05-311-1/+1
| * | | | | Add unit tests for escapeHTMLLukas Reschke2014-05-281-0/+11
| * | | | | Also encode > and 'Lukas Reschke2014-04-131-1/+1
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-0249-95/+105
* | | | | | Merge pull request #8811 from owncloud/fix-phpdoc-apBernhard Posselt2014-06-011-9/+1
|\ \ \ \ \ \
| * | | | | | Fix PHPDocLukas Reschke2014-06-011-9/+1
|/ / / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-01367-2242/+2464
* | | | | | Merge pull request #8798 from owncloud/fix-corejsVincent Petry2014-05-311-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix undefined JS on login/setup pageVincent Petry2014-05-301-3/+3
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-31310-8947/+18171
* | | | | | Merge pull request #8800 from owncloud/db-changes-as-required-by-8483Thomas Müller2014-05-314-98/+65
|\ \ \ \ \ \