summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Sort internal apps above 3rdparty appsRobin Appelman2013-01-311-0/+4
|
* Merge pull request #1379 from owncloud/improved_appsmanagementLukas Reschke2013-01-3110-28/+193
|\ | | | | Improved appsmanagement
| * update on translation stringThomas Mueller2013-01-311-1/+1
| |
| * just return "true" for nowFrank Karlitschek2013-01-311-0/+1
| |
| * l10n support for the error dialog addedThomas Mueller2013-01-311-1/+1
| |
| * Cleanup string - easier for translatorsThomas Mueller2013-01-311-1/+1
| |
| * style fixesThomas Mueller2013-01-311-21/+21
| |
| * style fixesThomas Mueller2013-01-311-10/+11
| |
| * remove spacesFrank Karlitschek2013-01-311-1/+1
| |
| * remove leftover codeFrank Karlitschek2013-01-301-3/+0
| |
| * fix typoFrank Karlitschek2013-01-301-1/+1
| |
| * merge masterFrank Karlitschek2013-01-301095-23861/+47762
| |\ | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php
| * | mark recommended apps. server part not yet fully implementedFrank Karlitschek2013-01-306-3/+21
| | |
| * | apps updater is now workingroot2013-01-302-22/+10
| | |
| * | we are getting closer. updating is not working yet.Frank Karlitschek2013-01-219-9/+167
| | |
* | | Merge pull request #1387 from schiesbn/visual_improvementsThomas Müller2013-01-312-5/+6
|\ \ \ | | | | | | | | small visual improvements
| * | | use the same tooltip as for the password fieldBjörn Schießle2013-01-311-0/+1
| | | |
| * | | addapt the css to adjust the change display name filed to the set password fieldBjörn Schießle2013-01-311-5/+5
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-01-31261-2732/+6341
| | | |
* | | | adding l10n support to files_trashbinThomas Mueller2013-01-312-0/+6
| | | |
* | | | Merge pull request #1358 from owncloud/button-fixJan-Christoph Borchardt2013-01-311-3/+4
|\ \ \ \ | | | | | | | | | | increase opacity of buttons, fix for dark backgrounds like header in pub...
| * | | | no box-shadow for public share download buttonJan-Christoph Borchardt2013-01-311-1/+1
| | | | |
| * | | | change button box-shadow from hard white to slight transparentJan-Christoph Borchardt2013-01-311-2/+2
| | | | |
| * | | | increase opacity of buttons, fix for dark backgrounds like header in public ↵Jan-Christoph Borchardt2013-01-291-2/+3
| | | | | | | | | | | | | | | | | | | | share, fix #1188
* | | | | Merge pull request #1266 from schiesbn/trash_binBjörn Schießle2013-01-3122-63/+948
|\ \ \ \ \ | | | | | | | | | | | | Trash bin
| * | | | | is_writable() is now isUpdatable() with the new filesystemBjörn Schießle2013-01-311-1/+1
| | | | | |
| * | | | | debug output removedBjörn Schießle2013-01-311-1/+0
| | | | | |
| * | | | | fix merge conflictBjörn Schießle2013-01-31555-16715/+20798
| |\ \ \ \ \
| * | | | | | keep mtimeBjörn Schießle2013-01-311-3/+6
| | | | | | |
| * | | | | | rename 'undelete' to 'restore'Björn Schießle2013-01-312-4/+4
| | | | | | |
| * | | | | | make spinner title translatableBjörn Schießle2013-01-302-3/+3
| | | | | | |
| * | | | | | add spinner for undelete operation for visualisationBjörn Schießle2013-01-301-1/+12
| | | | | | |
| * | | | | | show a spinner instead of the delete button while moving files to the trash binBjörn Schießle2013-01-302-3/+16
| | | | | | |
| * | | | | | fix OC_Log::ERROR callBjörn Schießle2013-01-301-1/+1
| | | | | | |
| * | | | | | some minor improvementsBjörn Schießle2013-01-302-4/+5
| | | | | | |
| * | | | | | make background transparentBjörn Schießle2013-01-301-0/+0
| | | | | | |
| * | | | | | improved message if trash bin is emptyBjörn Schießle2013-01-301-1/+1
| | | | | | |
| * | | | | | added some additional error handlingBjörn Schießle2013-01-291-11/+22
| | | | | | |
| * | | | | | seperate css no longer needed, use files app css insteadBjörn Schießle2013-01-292-79/+0
| | | | | | |
| * | | | | | icons added; empty trash bin message addedBjörn Schießle2013-01-296-8/+8
| | | | | | |
| * | | | | | merge conflict fixedBjörn Schießle2013-01-281-43/+0
| | | | | | |
| * | | | | | use hidden input field to disable sharingBjörn Schießle2013-01-281-0/+1
| | | | | | |
| * | | | | | fix merge conflictsBjörn Schießle2013-01-28446-8577/+30750
| |\ \ \ \ \ \
| * | | | | | | restore file in the root folder if the origin folder is not writableBjörn Schießle2013-01-241-1/+3
| | | | | | | |
| * | | | | | | code clean-upBjörn Schießle2013-01-234-21/+4
| | | | | | | |
| * | | | | | | remove inline JavaScriptBjörn Schießle2013-01-222-12/+20
| | | | | | | |
| * | | | | | | fix typo in commentBjörn Schießle2013-01-221-1/+1
| | | | | | | |
| * | | | | | | no undo notification for deleted file, we use the trash bin insteadBjörn Schießle2013-01-221-54/+15
| | | | | | | |
| * | | | | | | rebase to current master; merge conflicts resolvedBjörn Schießle2013-01-220-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | allow admin to change retention obligation for the trash bin, default value ↵Björn Schießle2013-01-222-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is 180 days