Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2012-10-28 | 132 | -2131/+2026 |
| | |||||
* | Load all apps in core share ajax file for apps to register their share backends | Michael Gapczynski | 2012-10-27 | 1 | -0/+1 |
| | |||||
* | don't enable user_external | Thomas Müller | 2012-10-27 | 1 | -1/+1 |
| | |||||
* | LDAP: usersInGroup now also does LDAP serverside search. | Arthur Schiwon | 2012-10-27 | 1 | -30/+41 |
| | |||||
* | LDAP: make filter in readAttribute configurable | Arthur Schiwon | 2012-10-27 | 1 | -2/+6 |
| | |||||
* | don't enable apps twice | Thomas Müller | 2012-10-27 | 1 | -2/+0 |
| | |||||
* | LDAP: getGroups to use paged searches | Arthur Schiwon | 2012-10-27 | 1 | -12/+20 |
| | |||||
* | LDAP: improve slicing | Arthur Schiwon | 2012-10-27 | 1 | -3/+8 |
| | |||||
* | LDAP: add error handling for failed searches | Arthur Schiwon | 2012-10-27 | 1 | -0/+5 |
| | |||||
* | LDAP: be careful which limit is send to possible paged LDAP search | Arthur Schiwon | 2012-10-27 | 1 | -1/+4 |
| | |||||
* | LDAP: use the correct attribute in filter | Arthur Schiwon | 2012-10-27 | 1 | -1/+1 |
| | |||||
* | LDAP: fix again proper check if groups are enabled | Arthur Schiwon | 2012-10-27 | 1 | -1/+3 |
| | |||||
* | remove TODO comment, it's done | Arthur Schiwon | 2012-10-27 | 1 | -1/+0 |
| | |||||
* | Fix introduced style errors | Bart Visscher | 2012-10-27 | 6 | -40/+52 |
| | |||||
* | Remove wrongly committed files | Bart Visscher | 2012-10-27 | 2 | -180/+0 |
| | |||||
* | remove remaining line from merge conflict | Björn Schießle | 2012-10-27 | 1 | -2/+1 |
| | |||||
* | Merge remote-tracking branch 'git://github.com/susinths/SabreDAV_1.7.1.git' | Bart Visscher | 2012-10-27 | 216 | -1142/+6469 |
|\ | | | | | | | | | Conflicts: lib/base.php | ||||
| * | Update Sabre to version 1.7.1 | Susinthiran Sithamparanathan | 2012-10-17 | 216 | -1142/+6471 |
| | | |||||
* | | Include copy of Symfony routing component, and don't use composer | Bart Visscher | 2012-10-27 | 44 | -22/+4037 |
| | | |||||
* | | fix function documentation | Björn Schießle | 2012-10-27 | 1 | -2/+1 |
| | | |||||
* | | fix broken paths in versions app | Björn Schießle | 2012-10-27 | 1 | -280/+279 |
| | | |||||
* | | don't call $('#found_versions').chosen(); after opening the history ↵ | Björn Schießle | 2012-10-27 | 1 | -1/+0 |
| | | | | | | | | drop-down since no version is selected at the beginning | ||||
* | | Fix download url generation | Bart Visscher | 2012-10-27 | 2 | -2/+2 |
| | | |||||
* | | fix paths in preeseed-config.php | Thomas Müller | 2012-10-27 | 1 | -2/+2 |
| | | |||||
* | | Add composer command for now, see | Bart Visscher | 2012-10-27 | 1 | -0/+0 |
| | | | | | | | | | | http://getcomposer.org/doc/00-intro.md#installation-nix for local install | ||||
* | | LDAP: let result processing in Access::search slice the array for ↵ | Arthur Schiwon | 2012-10-27 | 2 | -14/+11 |
| | | | | | | | | not-paginated search. getUsers e.g. does not need to take care of it anymore. adjustments in group_ldap to follow. | ||||
* | | LDAP: debug messaged | Arthur Schiwon | 2012-10-27 | 1 | -3/+4 |
| | | |||||
* | | LDAP: sourced out paged search init into initPagedSearch method, making ↵ | Arthur Schiwon | 2012-10-27 | 1 | -28/+46 |
| | | | | | | | | search slicker again | ||||
* | | Merge branch 'routing' | Bart Visscher | 2012-10-27 | 53 | -225/+792 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: core/lostpassword/index.php core/lostpassword/resetpassword.php | ||||
| * | | More info for composer.json | Bart Visscher | 2012-10-27 | 1 | -0/+10 |
| | | | |||||
| * | | Change Symfony/Component/Routing from submodule to composer fetching | Bart Visscher | 2012-10-27 | 5 | -5/+14 |
| | | | |||||
| * | | Resetting the password should also invalidate the token login cookies | Bart Visscher | 2012-10-17 | 1 | -0/+1 |
| | | | |||||
| * | | Change the lostpassword flow to a controller | Bart Visscher | 2012-10-17 | 6 | -67/+101 |
| | | | |||||
| * | | Merge branch 'master' into routing | Bart Visscher | 2012-10-17 | 1500 | -176214/+23713 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/search/provider/file.php settings/ajax/changepassword.php settings/settings.php | ||||
| | * | | Check for file exists before loading app version file | Bart Visscher | 2012-10-17 | 1 | -3/+2 |
| | | | | |||||
| * | | | Add API description to OC_Route and OC_Router | Bart Visscher | 2012-10-05 | 2 | -0/+71 |
| | | | | |||||
| * | | | Implement routing on javascript side | Bart Visscher | 2012-10-05 | 5 | -1/+96 |
| | | | | |||||
| * | | | Fix route name | Bart Visscher | 2012-10-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Make the core ajax calls use the router | Bart Visscher | 2012-10-02 | 9 | -10/+22 |
| | | | | |||||
| * | | | Make the settings ajax calls use the router | Bart Visscher | 2012-10-02 | 21 | -59/+72 |
| | | | | |||||
| * | | | fix actioninclude | Bart Visscher | 2012-09-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Convert menu entries of settings pages to use router | Bart Visscher | 2012-09-28 | 8 | -14/+34 |
| | | | | |||||
| * | | | Implement route for download in OC_Search_Provider_File | Bart Visscher | 2012-09-28 | 3 | -2/+18 |
| | | | | |||||
| * | | | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 14 | -34/+160 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-09-28 | 739 | -10430/+27881 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/filelist.js core/js/js.js lib/ocs.php | ||||
| * | | | | | Add linkToRoute functionality | Bart Visscher | 2012-09-12 | 2 | -6/+37 |
| | | | | | | |||||
| * | | | | | Remove redundant loadApps | Bart Visscher | 2012-09-07 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into routing | Bart Visscher | 2012-09-07 | 852 | -11512/+19011 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js lib/base.php lib/helper.php lib/ocs.php | ||||
| * \ \ \ \ \ | Merge branch 'master' into routing | Bart Visscher | 2012-08-30 | 1916 | -304209/+16808 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/contacts/js/contacts.js apps/contacts/lib/search.php apps/files_archive/js/archive.js apps/gallery/lib/tiles.php apps/gallery/templates/index.php lib/ocs.php | ||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'gitorious/master' into routing | Bart Visscher | 2012-08-29 | 1321 | -15741/+147757 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/js/fileactions.js apps/files_archive/js/archive.js |