Commit graph

599 commits

Author SHA1 Message Date
Robin Appelman
bb43cf378b Files: make sure keybinds js is loaded after files js 2013-01-16 21:36:25 +01:00
Robin Appelman
5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher
5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Bart Visscher
a8f963d9cf Spaces to tabs 2013-01-16 18:09:16 +01:00
Jenkins for ownCloud
0398bfffca [tx-robot] updated from transifex 2013-01-16 00:21:21 +01:00
Robin Appelman
7debfac0dc Cache: more efficient upgrading 2013-01-15 19:11:12 +01:00
Robin Appelman
94068e5d08 Cache: show upgrade progress 2013-01-15 18:13:50 +01:00
Bart Visscher
0da06187f6 Merge pull request #1187 from owncloud/fixing-unused-and-undefined-in-master
Fixing unused and undefined in master
2013-01-15 07:45:51 -08:00
Robin Appelman
9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Jenkins for ownCloud
fdd667a83c [tx-robot] updated from transifex 2013-01-15 00:05:10 +01:00
Thomas Mueller
388bb6a5e1 Merge branch 'master' into fixing-unused-and-undefined-in-master 2013-01-14 23:41:34 +01:00
Lukas Reschke
9eb16e06f7 Merge pull request #1135 from owncloud/allow_default_click_behaviour
allow default click behaviour
2013-01-14 11:24:02 -08:00
Thomas Müller
51a4240051 Merge pull request #1170 from owncloud/correctIndention
Remove ugly indentation - Trivial
2013-01-14 04:59:53 -08:00
Jenkins for ownCloud
c29310aaef [tx-robot] updated from transifex 2013-01-14 00:18:21 +01:00
Lukas Reschke
2a7e5faa37 Remove ugly indentation 2013-01-13 01:02:11 +01:00
Jenkins for ownCloud
981fd5e424 [tx-robot] updated from transifex 2013-01-13 00:08:40 +01:00
Jenkins for ownCloud
ad64ce189d [tx-robot] updated from transifex 2013-01-12 00:10:58 +01:00
Jenkins for ownCloud
d03dce1283 [tx-robot] updated from transifex 2013-01-11 00:06:14 +01:00
Thomas Müller
23dd7f1bea Merge pull request #1127 from owncloud/fixing-641-for-webdav-master
webdav returns "503 Service Unavailable" in case the ownCloud server is ...
2013-01-10 02:27:00 -08:00
Jenkins for ownCloud
912050afa0 [tx-robot] updated from transifex 2013-01-10 00:05:53 +01:00
Jörn Friedrich Dreyer
780fb37758 allow default click behaviour 2013-01-09 15:21:55 +01:00
Jörn Friedrich Dreyer
a40c95242f more translations 2013-01-09 12:48:57 +01:00
Thomas Mueller
ccdaec6296 webdav returns "503 Service Unavailable" in case the ownCloud server is currently in maintenance mode. 2013-01-09 00:37:50 +01:00
Jenkins for ownCloud
533f0e8e25 [tx-robot] updated from transifex 2013-01-09 00:05:49 +01:00
Thomas Tanghus
dae8f15f9f Merge pull request #938 from owncloud/fix_minor_files_annoyances
Fix minor files annoyances
2013-01-08 15:02:06 -08:00
Thomas Mueller
7b9e6d2f2c fixing string concatenation in javascript
refs ae54364d7c
2013-01-08 00:32:41 +01:00
Jenkins for ownCloud
b69328e1d1 [tx-robot] updated from transifex 2013-01-08 00:31:36 +01:00
Jörn Friedrich Dreyer
3bb7ee521f attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index 2013-01-07 12:23:29 +01:00
Jörn Friedrich Dreyer
da442b024c remove aborted uploads 2013-01-07 11:11:21 +01:00
Jörn Friedrich Dreyer
cbb118d4a3 adapt to isFileNameValid, whitespace cleanup 2013-01-07 10:39:35 +01:00
Robin Appelman
e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +01:00
Jenkins for ownCloud
0b007235b9 [tx-robot] updated from transifex 2013-01-07 00:06:32 +01:00
Thomas Mueller
a0d6f0e127 fixing undefined $eventSource 2013-01-06 23:36:31 +01:00
Thomas Mueller
9671ace32e Merge branch 'master' into fix_minor_files_annoyances
Conflicts:
	apps/files/js/files.js
2013-01-06 22:46:40 +01:00
Thomas Mueller
b4191b7da5 rename containsInvalidCharacters() to isFileNameValid() - NOTE: semantic has changed!
adding file name checks and notifications to isFileNameValid() for . and empty file name
2013-01-06 12:52:00 +01:00
Robin Appelman
a5dcbc3d8a Files: prevent people from renaming files to '.' 2013-01-05 03:30:05 +01:00
Jenkins for ownCloud
934d9dcc42 [tx-robot] updated from transifex 2013-01-05 00:03:58 +01:00
Jörn Friedrich Dreyer
9cd7bb2c8d reverse z-index of a and input to make upload work again in ie8/9 2013-01-04 13:48:29 +01:00
Jörn Friedrich Dreyer
de496ed16d remove initial iframe, is added automatically by jquery upload mechanism 2013-01-04 13:47:47 +01:00
Jenkins for ownCloud
90f39cd703 [tx-robot] updated from transifex 2013-01-04 13:23:31 +01:00
Robin Appelman
e40be93e87 merge master into filesystem 2013-01-03 15:59:17 +01:00
Thomas Müller
b673748151 Merge pull request #1063 from owncloud/translate_not_enough_space_available
add translation call for 'Not enough space available' upload error
2013-01-03 06:46:36 -08:00
Jörn Friedrich Dreyer
fc64e8ec58 fix error when wrong dir was specified 2013-01-03 13:34:56 +01:00
Jörn Friedrich Dreyer
f19787f84c move $l to top 2013-01-03 12:00:07 +01:00
Jörn Friedrich Dreyer
ea732e5b29 also translate 'No file was uploaded. Unknown error' 2013-01-03 11:57:17 +01:00
Jenkins for ownCloud
3bcdd8c900 [tx-robot] updated from transifex 2013-01-03 00:05:19 +01:00
Thomas Müller
e0e7c98100 Merge pull request #1041 from owncloud/fixing-856-master
Fixing #856 master
2013-01-02 14:58:54 -08:00
Thomas Mueller
3ea9432d43 fixing undefined variable $l 2013-01-02 22:15:43 +01:00
Jörn Friedrich Dreyer
0405edc798 add translation call for 'Not enough space available' upload error 2013-01-02 21:00:50 +01:00
Jörn Friedrich Dreyer
03b8a065cf input/form switching cleanup 2013-01-02 17:03:16 +01:00