Jenkins for ownCloud
|
bfe6334cd9
|
[tx-robot] updated from transifex
|
2013-02-14 00:06:51 +01:00 |
|
Thomas Mueller
|
9d6f74c65e
|
missing piece after merge
|
2013-02-13 10:59:41 +01:00 |
|
Thomas Mueller
|
bc43dd704f
|
Merge branch 'master' into fixing-1424-master
Conflicts:
settings/js/users.js
|
2013-02-13 01:18:01 +01:00 |
|
Jenkins for ownCloud
|
68fa0b7dcc
|
[tx-robot] updated from transifex
|
2013-02-13 00:05:40 +01:00 |
Frank Karlitschek
|
316807e0d3
|
Merge pull request #1624 from owncloud/singleselect
Split editable select code used for quota selection into a jquery plugin
|
2013-02-12 11:05:07 -08:00 |
|
Jenkins for ownCloud
|
8d9352a40d
|
[tx-robot] updated from transifex
|
2013-02-12 15:12:46 +01:00 |
|
Jenkins for ownCloud
|
fb23ac3ce2
|
[tx-robot] updated from transifex
|
2013-02-12 00:21:45 +01:00 |
|
Thomas Mueller
|
037fcde133
|
Merge branch 'master' into fixing-1424-master
|
2013-02-11 21:42:27 +01:00 |
|
Jenkins for ownCloud
|
39d19a9274
|
[tx-robot] updated from transifex
|
2013-02-11 15:42:41 +01:00 |
Robin Appelman
|
e68e5cc849
|
Split editable select code used for quota selection into a jquery plugin
|
2013-02-11 15:18:14 +01:00 |
Jan-Christoph Borchardt
|
efc70e27bc
|
Merge pull request #1610 from owncloud/improved_personal_page
add the buttons for the clients to the personal page.
|
2013-02-11 03:51:11 -08:00 |
|
Jan-Christoph Borchardt
|
40d8a2531d
|
move CSS to correct location, move and format php
|
2013-02-11 12:49:52 +01:00 |
|
Jan-Christoph Borchardt
|
47341eb4bd
|
spaces to tabs
|
2013-02-11 12:41:14 +01:00 |
|
Jan-Christoph Borchardt
|
2b586eb91c
|
correct target blank from image to link
|
2013-02-11 12:40:17 +01:00 |
|
Thomas Müller
|
b9089fe8d9
|
Merge branch 'master' into fixing-1424-master
|
2013-02-09 19:15:23 +01:00 |
|
Thomas Müller
|
0222c589ac
|
Merge pull request #1546 from owncloud/fix-loading-hooks
Fix loading hooks when going though the routing system
|
2013-02-09 09:59:41 -08:00 |
|
Thomas Müller
|
e68cf72458
|
Merge pull request #1543 from owncloud/utf8-locale-master
some systems use en_US.UTF8 instead of en_US.UTF-8
|
2013-02-09 09:58:05 -08:00 |
|
Thomas Müller
|
460faf3f97
|
Merge pull request #1569 from owncloud/clean-app-id
Remove invalid characters from app id to prevent loading of invalid reso...
|
2013-02-09 09:56:26 -08:00 |
Jörn Friedrich Dreyer
|
bb656ca2fb
|
Merge pull request #1561 from Raydiation/master
Moved the iframe height and width fix from js to css
|
2013-02-09 08:56:12 -08:00 |
Bernhard Posselt
|
62122148bf
|
Revert "moved iframe height and width fix from js to css"
This reverts commit 842fc85b9a.
|
2013-02-09 17:46:23 +01:00 |
|
Bernhard Posselt
|
842fc85b9a
|
moved iframe height and width fix from js to css
|
2013-02-09 17:41:17 +01:00 |
|
Thomas Müller
|
d67d9566ce
|
Merge branch 'master' into clean-app-id
|
2013-02-09 17:28:30 +01:00 |
Bart Visscher
|
9dddcae9ca
|
Remove invalid characters from app id to prevent loading of invalid resources
|
2013-02-09 15:10:40 +01:00 |
Lukas Reschke
|
18fa8e2753
|
json_encode the appid
|
2013-02-09 15:06:35 +01:00 |
|
Thomas Müller
|
279cbeb001
|
Merge pull request #1481 from owncloud/fixing-1354-master
basic WebDAV test in place now
|
2013-02-09 05:13:33 -08:00 |
|
Bernhard Posselt
|
f8335c4815
|
moved iframe height and width fix from js to css
|
2013-02-09 11:34:25 +01:00 |
|
Frank Karlitschek
|
4a130d106c
|
I'm an evil bastard and I commit this 3 letter text fix without a pull request.
|
2013-02-09 10:09:37 +01:00 |
|
Jenkins for ownCloud
|
04146f2059
|
[tx-robot] updated from transifex
|
2013-02-11 00:04:49 +01:00 |
Björn Schießle
|
45a4016878
|
Merge pull request #1552 from raghunayyar/personalpage-style-fix
Personal Page Password Toggle Loads Fine.
|
2013-02-10 07:31:05 -08:00 |
Björn Schießle
|
d8fee28b3b
|
add switch to enable/disable the possibility to change the display name by the user
|
2013-02-10 14:43:31 +01:00 |
|
Lukas Reschke
|
01fabd6c65
|
Merge pull request #1577 from owncloud/typo_catagory
Typo
|
2013-02-10 02:31:34 -08:00 |
|
Jenkins for ownCloud
|
f7d898d835
|
[tx-robot] updated from transifex
|
2013-02-10 00:10:29 +01:00 |
|
Lukas Reschke
|
2dde418e99
|
Remove uneeded lines
|
2013-02-09 23:43:48 +01:00 |
|
Lukas Reschke
|
bd2f8980cd
|
Typo
|
2013-02-09 23:37:42 +01:00 |
|
Frank Karlitschek
|
c14f0b5637
|
add in new window
|
2013-02-09 09:30:59 +01:00 |
|
Frank Karlitschek
|
9bd45b26a5
|
add the buttons for the clients to the personal page.
Useful and prettier
|
2013-02-09 09:13:11 +01:00 |
raghunayyar
|
e8d17e4e8e
|
Personal Page Password Toggle Also Loads Well.
|
2013-02-09 11:40:07 +05:30 |
|
Jenkins for ownCloud
|
e5c05e9674
|
[tx-robot] updated from transifex
|
2013-02-09 00:14:08 +01:00 |
|
Bart Visscher
|
340d6fce11
|
Better way of getting the navigation entries for an app
|
2013-02-08 18:53:43 +01:00 |
|
Thomas Müller
|
232a98524c
|
some systems use en_US.UTF8 instead of en_US.UTF-8
|
2013-02-08 17:49:54 +01:00 |
|
Thomas Müller
|
05b46f7828
|
on creation only test for existing users if the backend supports user creation
this solves the issue where no users can be created any more if backends are active which always return true on userExists() like WebDAV Auth
|
2013-02-08 17:16:18 +01:00 |
|
Jenkins for ownCloud
|
59249ebc0c
|
[tx-robot] updated from transifex
|
2013-02-08 00:13:16 +01:00 |
|
Thomas Mueller
|
5788d36c8d
|
Merge branch 'master' into fixing-1354-master
Conflicts:
settings/admin.php
settings/templates/admin.php
|
2013-02-07 10:44:28 +01:00 |
|
Thomas Mueller
|
84f3c8b6cc
|
show webdav test results in admin section as well
|
2013-02-07 00:49:39 +01:00 |
|
Jenkins for ownCloud
|
35bd7a400d
|
[tx-robot] updated from transifex
|
2013-02-07 00:11:04 +01:00 |
|
Lukas Reschke
|
e969a78cf9
|
Merge pull request #1443 from owncloud/use-module-file-info-master
we get best results regarding mime type detection if we use fileinfo - l...
|
2013-02-06 11:53:13 -08:00 |
|
Lukas Reschke
|
93b1597395
|
Merge pull request #1506 from owncloud/files_encryption
Files encryption
|
2013-02-06 11:47:55 -08:00 |
|
Lukas Reschke
|
ad644b4e08
|
Merge pull request #1363 from owncloud/FixPasswordChange
Fix password change
|
2013-02-06 11:14:59 -08:00 |
Sam Tuke
|
2c22619a18
|
Reverted fix temporarily; another fix by LukasReschke is awaiting merge
|
2013-02-06 19:06:55 +00:00 |
|
Sam Tuke
|
faf6cb0868
|
Merge branch 'master' into files_encryption
|
2013-02-06 18:26:44 +00:00 |
|
Sam Tuke
|
954a627483
|
Added comment
|
2013-02-06 18:24:35 +00:00 |
|
Sam Tuke
|
81de09711b
|
Fixed bug causing password change related hooks to not be called due to ajax
|
2013-02-06 17:42:29 +00:00 |
Thomas Tanghus
|
3879e5d9c5
|
Merge pull request #1428 from owncloud/content_positioning
Fix leftcontent positioning. Ref #1255
|
2013-02-06 08:13:45 -08:00 |
|
Sam Tuke
|
d9631aebfc
|
Merge branch 'master' into files_encryption
|
2013-02-06 16:05:14 +00:00 |
|
Sam Tuke
|
a8c0e3612c
|
Removed call to depreciated isUserVerified()
|
2013-02-06 16:01:43 +00:00 |
Georg Ehrke
|
0a16d25724
|
make it possible to modify the links to the clients
|
2013-02-06 15:20:43 +01:00 |
|
Björn Schießle
|
e68d0c7398
|
make strings translatable
|
2013-02-06 11:55:19 +01:00 |
|
Björn Schießle
|
9d73e7eb1e
|
let the user change his display name, if supported by the back-end
|
2013-02-06 11:38:03 +01:00 |
|
Jenkins for ownCloud
|
335b6cd060
|
[tx-robot] updated from transifex
|
2013-02-06 00:06:28 +01:00 |
Arthur Schiwon
|
5221ee0c5a
|
offer change password only when the action is supported by the user backend
|
2013-02-05 19:26:00 +01:00 |
|
Thomas Tanghus
|
cda0780d4b
|
Remove superfluous append
|
2013-02-05 14:15:17 +01:00 |
|
Jan-Christoph Borchardt
|
2ec0c491d4
|
remove superfluous enabled-app class again
|
2013-02-05 11:30:18 +01:00 |
|
Jan-Christoph Borchardt
|
4059959c5f
|
Merge branch 'master' into fix_addNavigation
|
2013-02-05 11:09:38 +01:00 |
|
Jenkins for ownCloud
|
98f37f4bed
|
[tx-robot] updated from transifex
|
2013-02-05 00:20:29 +01:00 |
|
Thomas Tanghus
|
b06ac67e07
|
Add 'hascontrols' class for content with fixed topbar.
|
2013-02-04 18:30:49 +01:00 |
|
Thomas Mueller
|
6058c2f734
|
we get best results regarding mime type detection if we use fileinfo - let's tell the admin about that
|
2013-02-04 15:04:26 +01:00 |
|
Thomas Tanghus
|
46e10407f7
|
Remove padding hack to position users list.
|
2013-02-04 14:09:32 +01:00 |
|
Thomas Müller
|
04b97a1906
|
Merge pull request #1229 from owncloud/from_live_to_on
replace live() with on() in core js
|
2013-02-03 21:55:54 -08:00 |
|
Jenkins for ownCloud
|
da6e79a381
|
[tx-robot] updated from transifex
|
2013-02-04 00:05:52 +01:00 |
|
Thomas Tanghus
|
88ad1e5fbd
|
Make app icon linkable when enabling app.
|
2013-02-03 16:02:25 +01:00 |
|
Jenkins for ownCloud
|
2936140838
|
[tx-robot] updated from transifex
|
2013-02-03 00:06:15 +01:00 |
|
Jenkins for ownCloud
|
b29b55a332
|
[tx-robot] updated from transifex
|
2013-02-02 00:08:15 +01:00 |
|
blizzz
|
88f4aced38
|
Merge pull request #1404 from owncloud/fixing-1276-master
fix #1276 - use registerLoadedCallback()
|
2013-02-01 03:13:23 -08:00 |
|
Thomas Mueller
|
cc73568d68
|
Updateing -> Updating
|
2013-02-01 00:51:00 +01:00 |
|
Thomas Mueller
|
402263bd5c
|
fix #1276 - use registerLoadedCallback()
|
2013-02-01 00:33:14 +01:00 |
|
Jenkins for ownCloud
|
94f7446724
|
[tx-robot] updated from transifex
|
2013-02-01 00:19:28 +01:00 |
Michael Gapczynski
|
a9e1c9bf6d
|
Merge pull request #1351 from owncloud/navigation
New navigation design
|
2013-01-31 14:37:39 -08:00 |
|
Thomas Mueller
|
b1da1db0eb
|
Merge branch 'master' into from_live_to_on
Conflicts:
apps/files_external/js/google.js
|
2013-01-31 23:34:12 +01:00 |
|
Jan-Christoph Borchardt
|
943c0334c1
|
remove z-index from app labels which caused overlap with top bar
|
2013-01-31 20:27:39 +01:00 |
|
Jan-Christoph Borchardt
|
3d5c7ca245
|
Merge branch 'master' into navigation
|
2013-01-31 19:28:25 +01:00 |
|
Robin Appelman
|
a224d80f4d
|
Sort internal apps above 3rdparty apps
|
2013-01-31 17:49:58 +01:00 |
|
Lukas Reschke
|
b471177439
|
Merge pull request #1379 from owncloud/improved_appsmanagement
Improved appsmanagement
|
2013-01-31 08:30:55 -08:00 |
|
Thomas Müller
|
0dd9e6cb12
|
Merge pull request #1387 from schiesbn/visual_improvements
small visual improvements
|
2013-01-31 08:30:25 -08:00 |
|
Jenkins for ownCloud
|
209d599ec5
|
[tx-robot] updated from transifex
|
2013-01-31 17:05:21 +01:00 |
|
Jan-Christoph Borchardt
|
ad044eb888
|
Merge branch 'master' into navigation
|
2013-01-31 15:35:20 +01:00 |
|
Thomas Mueller
|
85a12970c7
|
update on translation string
|
2013-01-31 14:11:31 +01:00 |
|
Jan-Christoph Borchardt
|
c801b86bc2
|
Merge pull request #1359 from raghunayyar/navigation
No Image Repetition on Enabling Apps in Navigation Bar
|
2013-01-31 05:01:20 -08:00 |
|
Thomas Mueller
|
3af09f2acf
|
l10n support for the error dialog added
|
2013-01-31 10:43:59 +01:00 |
|
Thomas Mueller
|
8a662a6c74
|
Cleanup string - easier for translators
|
2013-01-31 10:34:54 +01:00 |
|
Björn Schießle
|
170cf20298
|
addapt the css to adjust the change display name filed to the set password field
|
2013-01-31 09:57:16 +01:00 |
|
raghunayyar
|
b978cc8b28
|
Shorter, Cleaner JS in apps.js
|
2013-01-31 11:52:56 +05:30 |
|
Jenkins for ownCloud
|
00a30e6651
|
[tx-robot] updated from transifex
|
2013-01-31 00:31:28 +01:00 |
|
Jörn Friedrich Dreyer
|
de00111c1f
|
use on instead of live in users.js
|
2013-01-30 17:49:02 +01:00 |
|
Jörn Friedrich Dreyer
|
22812c5f0d
|
replace live() with on() in core js
|
2013-01-30 17:00:54 +01:00 |
|
Björn Schießle
|
92921ceefd
|
make strings translatable
|
2013-01-30 16:28:41 +01:00 |
|
Frank Karlitschek
|
ea5861ed8c
|
remove leftover code
|
2013-01-30 15:27:20 +01:00 |
|
Frank Karlitschek
|
5e422dea61
|
fix typo
|
2013-01-30 14:52:35 +01:00 |
|
raghunayyar
|
0dfbd53a6e
|
Reduced Styling and Image loads as from src and not backgorund.
|
2013-01-30 19:12:51 +05:30 |
|
Frank Karlitschek
|
66cab77b6d
|
merge master
Merge branch 'master' into improved_appsmanagement
Conflicts:
settings/apps.php
settings/templates/apps.php
|
2013-01-30 14:36:17 +01:00 |
|
Jan-Christoph Borchardt
|
284e690737
|
Merge branch 'master' into navigation
|
2013-01-30 13:53:43 +01:00 |