summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Trash: disable text editor from trash for nowRobin Appelman2013-02-271-0/+4
* Trash: fix download.phpRobin Appelman2013-02-271-1/+1
* Trash: fix trash when default quota is usedRobin Appelman2013-02-271-1/+1
* Merge master into trash_fileactionsRobin Appelman2013-02-27373-2469/+30049
|\
| * Merge pull request #1031 from owncloud/external_storage_ui_feedbackMichael Gapczynski2013-02-2716-182/+390
| |\
| | * Fix Dropbox and Google uiMichael Gapczynski2013-02-252-11/+11
| | * Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-25124-595/+1129
| | |\
| | * | attach on() events to external storage table, dom events in the table will al...Jörn Friedrich Dreyer2013-02-201-3/+3
| | * | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-19116-262/+801
| | |\ \
| | * | | fixing issues with UTF8 characters in translatable stringsThomas Mueller2013-02-132-7/+2
| | * | | adding spinner while talking to the backendThomas Mueller2013-02-122-2/+7
| | * | | Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-1216-22/+146
| | |\ \ \
| | * | | | fixing namespaceThomas Mueller2013-02-122-3/+3
| | * | | | Merge branch 'master' into external_storage_ui_feedbackThomas Mueller2013-02-1219-7/+102
| | |\ \ \ \
| | * | | | | fixing namespaceThomas Mueller2013-02-122-3/+3
| | * | | | | Replace another mount point placeholderMichael Gapczynski2013-02-111-1/+1
| | * | | | | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-02-11503-3541/+37533
| | |\ \ \ \ \
| | * | | | | | Change wordingsMichael Gapczynski2013-02-111-3/+3
| | * | | | | | Merge branch 'master' into external_storage_ui_feedbackMichael Gapczynski2013-01-09144-184/+896
| | |\ \ \ \ \ \
| | * | | | | | | Set status to waiting for Dropbox and Google Drive while authenticatingMichael Gapczynski2013-01-092-0/+6
| | * | | | | | | Remove accidentally included fileMichael Gapczynski2013-01-021-5/+0
| | * | | | | | | Listen to checkbox changes as wellMichael Gapczynski2013-01-021-0/+4
| | * | | | | | | Fix 'Grant Access' button for multiple Google Drive mount points and prevent ...Michael Gapczynski2013-01-023-11/+25
| | * | | | | | | Turn off async for saving mount points, improve input detection for Google an...Michael Gapczynski2013-01-013-71/+123
| | * | | | | | | Fix problems with chosen multiselectMichael Gapczynski2012-12-281-15/+31
| | * | | | | | | Fix some of the default mount points creating sub folders i.e. SMB / CIFS, ow...Michael Gapczynski2012-12-281-1/+6
| | * | | | | | | Move storage backend tests from constructor to test functionMichael Gapczynski2012-12-287-26/+17
| | * | | | | | | Fix last commit's variableMichael Gapczynski2012-12-261-2/+1
| | * | | | | | | Listen to paste events for dropbox configurationMichael Gapczynski2012-12-261-4/+15
| | * | | | | | | Change callback url for dropbox as wellMichael Gapczynski2012-12-261-1/+1
| | * | | | | | | Save configuration after paste events and 2 seconds after typingMichael Gapczynski2012-12-261-2/+17
| | * | | | | | | Prevent javascript error if no value is set for the multiselectMichael Gapczynski2012-12-241-1/+6
| | * | | | | | | Change callback url to path only in case oauth parameters are still in urlMichael Gapczynski2012-12-241-1/+1
| | * | | | | | | Show status icons for mount points in external storage UIMichael Gapczynski2012-12-2415-107/+203
| * | | | | | | | remove admin settings from app.phpBjörn Schießle2013-02-271-2/+0
| * | | | | | | | Merge branch 'master' into versions_cleanupBjörn Schießle2013-02-2711-12/+33
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-277-1/+20
| | * | | | | | | | Merge pull request #1953 from owncloud/escape_regular_expressionsFrank Karlitschek2013-02-272-4/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | escape regular expressions; fix typo in variable nameBjörn Schießle2013-02-272-4/+3
| | * | | | | | | | | Merge pull request #1948 from owncloud/improve_user_sortingBernhard Posselt2013-02-271-1/+10
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | LDAP: sort users on server-sideArthur Schiwon2013-02-261-1/+10
| | * | | | | | | | | | Merge pull request #1905 from owncloud/fix-share-iconsThomas Müller2013-02-271-6/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | remove general CSS from IE specific rules, displays Shared state permanently ...Jan-Christoph Borchardt2013-02-261-6/+0
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| * | | | | | | | | | rename History to VersionsBjörn Schießle2013-02-271-2/+2
| * | | | | | | | | | remove admin settings for versionsBjörn Schießle2013-02-274-38/+0
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #1949 from owncloud/fix-dropboxMichael Gapczynski2013-02-261-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix undefined root parameter in Dropbox storageMichael Gapczynski2013-02-261-2/+2
| | | |/ / / / / / / | | |/| | | | | | |
| * / | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-02-276-1/+32
| |/ / / / / / / /
| * | | | | | | | Add missing echoLukas Reschke2013-02-261-1/+1
| * | | | | | | | cleanPath needs to be publicBjörn Schießle2013-02-261-1/+1