Commit graph

2053 commits

Author SHA1 Message Date
Jan-Christoph Borchardt
0aaa1fb64e added Silk icons by Mark James (CC-BY) 2011-10-07 16:05:39 +02:00
Bart Visscher
980a0893f0 Change colorselector to use border for selected color 2011-10-07 16:03:26 +02:00
Robin Appelman
20554be9f4 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-07 00:15:54 +02:00
Robin Appelman
d0107a0c0a Merge branch 'master' into ace-editor 2011-10-07 00:07:21 +02:00
Marvin Thomas Rabe
e345fbd386 conflicts solved 2011-10-06 22:40:11 +02:00
Marvin Thomas Rabe
bb26fe9300 Merge commit 'refs/merge-requests/55' of git://gitorious.org/owncloud/owncloud into merge-requests/55 2011-10-06 22:37:06 +02:00
Marvin Thomas Rabe
ae56bb63c6 Merge commit 'refs/merge-requests/52' of git://gitorious.org/owncloud/owncloud into merge-requests/52 2011-10-06 22:36:34 +02:00
Marvin Thomas Rabe
543e8456b7 Merge commit 'refs/merge-requests/53' of git://gitorious.org/owncloud/owncloud into merge-requests/53 2011-10-06 22:36:06 +02:00
Marvin Thomas Rabe
878178145d Merge commit 'refs/merge-requests/54' of git://gitorious.org/owncloud/owncloud into merge-requests/54 2011-10-06 22:35:36 +02:00
Bart Visscher
3cc7212c82 Add icon for calendar color selector 2011-10-06 21:22:55 +02:00
Bart Visscher
b0847a61f5 Start using OC_JSON in gallery app 2011-10-06 21:22:01 +02:00
Bart Visscher
4786ed321e Replace _ in timezone setting with a space 2011-10-06 13:22:36 +02:00
Bart Visscher
c28f1e0276 Implement timezone fix from Stephen Rees-Carter 2011-10-06 13:22:36 +02:00
Georg Ehrke
bf017fb4bd Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-06 13:21:38 +02:00
Georg Ehrke
55ab68a332 support of RRULE in calendar app 2011-10-06 13:21:13 +02:00
Stephen Rees-Carter
c853fc75a1 BUGFIX: removed the hard-coded Continent selection for Calendar Timezones. 2011-10-06 10:31:05 +11:00
Stephen Rees-Carter
08c38c8158 Updating .gitignore to ignore *.geany project files. 2011-10-06 10:30:17 +11:00
Tom Needham
d9464de690 Updated saving feedback 2011-10-05 21:59:03 +01:00
Bartek Przybylski
f92fa6989e another query fix 2011-10-05 22:28:17 +02:00
Tom Needham
30343f15e2 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-05 20:49:08 +01:00
Michiel@unhosted
af6eb52b5e correct wrong variable name in remoteStorage app 2011-10-05 20:01:58 +02:00
Bartek Przybylski
d5931b8c48 gallery db query fix 2011-10-05 19:32:30 +02:00
Tom Needham
edd958836e Moved addScript and addStyle calls to app.php 2011-10-05 16:32:01 +01:00
Tom Needham
86825ee3b5 Cleanup of code. Fixed breadcrumb removal issue 2011-10-05 16:10:11 +01:00
Jan-Christoph Borchardt
28dcbe3cb0 disabled gallery app by default until it's in a branch 2011-10-05 14:54:34 +02:00
Jan-Christoph Borchardt
8e532b5ceb removed extra calendar settings. Also, table layout? 2011-10-05 14:32:25 +02:00
Borjan Tchakaloff
5570222b40 Added the missing quotes on the filename. 2011-10-05 15:20:32 +04:00
Borjan Tchakaloff
3388381deb Fixed the 'Undefined index "user_id"' bug when requesting a publicly shared folder and being logged-out.
The OC_App::navigation array contains by default only the help menu.
2011-10-05 14:31:33 +04:00
Borjan Tchakaloff
0cde2a3146 Fixed the file sharing listing bug (filename is empty when it has no extension in a publicly shared folder). 2011-10-05 14:27:50 +04:00
Robin Appelman
15e5bd16ab use texteditor for search results 2011-10-05 02:44:24 +02:00
Robin Appelman
c6a73bee5e remove now unneeded textviewer 2011-10-05 02:38:55 +02:00
Robin Appelman
1fba8619d4 move some code to where it belongs and remove duplicated editor app 2011-10-05 02:36:54 +02:00
Robin Appelman
a8621265e2 Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-05 02:11:44 +02:00
Florian Jacob
813e8b274a Added all the remaining extensions to filetypes
mapping which ace-editor supports.
2011-10-05 00:23:16 +02:00
Marvin Thomas Rabe
7579fc7bc9 updated margins 2011-10-04 21:39:13 +02:00
Tom Needham
93ed844015 Control events are now bound on the page load rather than everytime the editor is loaded. 2011-10-04 20:20:08 +01:00
Bart Visscher
2c95c799e6 Add new contact name to end of cantact list 2011-10-04 21:16:57 +02:00
Bart Visscher
fada3517b0 All the basic field for add contact added 2011-10-04 21:16:57 +02:00
Tom Needham
39d42fc62b Save button now removed after closing editor 2011-10-04 20:15:20 +01:00
Marvin Thomas Rabe
0179b61f69 fixed another bug with breadcrumbs 2011-10-04 21:05:49 +02:00
Marvin Thomas Rabe
451b5940ea fixed scrollbar issues. fixed missing breadcrumb image. 2011-10-04 21:01:05 +02:00
Tom Needham
fa203d186e Added fillHeight() js function for resizing editor 2011-10-04 19:46:27 +01:00
Tom Needham
2d9c3d75f3 Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor 2011-10-04 19:17:23 +01:00
Tom Needham
09c1179094 Fixed breadcrumb issue. 2011-10-04 19:07:22 +01:00
Marvin Thomas Rabe
4bcb6f5346 remeber cookie bug fixed 2011-10-04 19:41:00 +02:00
Marvin Thomas Rabe
340f6bbaba Merge branch 'master' of gitorious.org:owncloud/owncloud 2011-10-04 19:37:54 +02:00
Marvin Thomas Rabe
d1518f2901 updated calendar settings 2011-10-04 19:37:26 +02:00
Marvin Thomas Rabe
33f24a42b8 redirect url fixed 2011-10-04 19:27:57 +02:00
Marvin Thomas Rabe
314e84716b changed shadow transparency to 50% 2011-10-04 18:58:38 +02:00
Marvin Thomas Rabe
de21378291 fixed scrollbar issues 2011-10-04 18:54:07 +02:00